Merge commit 'upstream/0.4.5+svn3450_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Fri, 3 Feb 2012 22:24:54 +0000 (23:24 +0100)
committerAlessio Treglia <alessio@debian.org>
Fri, 3 Feb 2012 22:24:54 +0000 (23:24 +0100)
commit673f04da883a92c3bfa322dc9fdce588ece13747
treeca1e6cc9622db794b20e5f67eaa784e3ccd6b3e6
parent861612644e31305109b357a3a76ac6133a21dc42
parent105f6c9b70215784f970852d158a9722e6de60a4
Merge commit 'upstream/0.4.5+svn3450_dfsg1'